projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
005894e
)
wayland: Acquire cairo device during operations that need the GL context
author
Daniel Nicoara
<dnicoara@chromium.org>
Mon, 22 Aug 2011 20:31:27 +0000
(16:31 -0400)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Mon, 22 Aug 2011 20:32:06 +0000
(16:32 -0400)
gdk/wayland/gdkwindow-wayland.c
patch
|
blob
|
history
diff --git
a/gdk/wayland/gdkwindow-wayland.c
b/gdk/wayland/gdkwindow-wayland.c
index 194d7633e51cf46db90df79de197e6e5daa31447..b2be78b34d10fe148bf97a4b77a5807938663014 100644
(file)
--- a/
gdk/wayland/gdkwindow-wayland.c
+++ b/
gdk/wayland/gdkwindow-wayland.c
@@
-400,9
+400,11
@@
gdk_wayland_create_cairo_surface (GdkDisplayWayland *display,
display->create_image(display->egl_display, NULL, EGL_NATIVE_PIXMAP_KHR,
(EGLClientBuffer) data->pixmap, NULL);
+ cairo_device_acquire(display->cairo_device);
glGenTextures(1, &data->texture);
glBindTexture(GL_TEXTURE_2D, data->texture);
display->image_target_texture_2d(GL_TEXTURE_2D, data->image);
+ cairo_device_release(display->cairo_device);
surface = cairo_gl_surface_create_for_texture(display->cairo_device,
CAIRO_CONTENT_COLOR_ALPHA,